Fixed shortcut collisions on OSX
typo
Merge pull request #6 from jameshiew/develop

Develop