Merge pull request #17 from alexdarling/develop

Develop