Updated to match shell key changes in core
Merge pull request #202 from maksimov/develop

Updated to match shell key changes in core