Merge pull request #8 from Artiano/develop

Develop