Merge pull request #2 from svj0hn/inputcleanup

Inputcleanup