Merge branch 'develop'
Merge branch 'release-0.2.1'
Apply changed shortcut
Merge branch 'master' into develop