Added controller support to the input
Merge branch 'master' of https://github.com/ajclarke/shafted