small update echelman
Merge branch 'master' of https://github.com/arodic/custom-inputs
merged with echelman
merged with echelman