Merge pull request #8 from mcharite/develop

Develop