Merge pull request #1 from Joonia/develop

Develop merged to master