Merge pull request #1 from alanorth/develop

Develop
Merge pull request #2 from projectmjanja/develop

Merge pull request #1 from alanorth/develop