Merge pull request #1 from maclovr/develop

Develop