Merge pull request #18 from adamcandy/master

Merge pull request #17 from adamcandy/dev