Merge pull request #3 from korpling/develop

Merge into amir-zeldes:develop