Merge pull request #36 from sphaero/master

Merged