Merge pull request #18 from adamcandy/master

Merge pull request #17 from adamcandy/dev
Merge pull request #22 from adamcandy/dev

Merge pull request #18 from adamcandy/master