Merge pull request #11 from adamcandy/dev

Merge pull request #10 from adamcandy/master
Merge pull request #12 from adamcandy/master

Merge pull request #11 from adamcandy/dev