Issue 9

Merged branches issue-7 and issue-8
Cool that you followed their docs instead. Better.