Fixing issue with mapping events to commands
Merge branch 'develop'