Merge branch 'master' into dev
Merge conflict
Merge pull request #11 from flymke/dev

Dev