Merge branch 'master' into dev
Merge pull request #51 from hafen/master

Sync branches