merging with master
Merge pull request #19 from scopely/merge-with-master

Merge with master