Merging master into develop
Merge pull request #3 from fisjer/develop

Merging master into develop