Fix for #14
Merge branch 'development' of github.com:tdt/input into development