Merge branch 'master' into dev
Merge pull request #6 from Kurtz1993/dev

Merge branch 'master' into dev