Merge pull request #30 from EmergentBehavior/master

Closes #30