Merge pull request #64 from bartdegoede/dev

Merged development from master into dev