better input handling, hopefully?
Merge pull request #1 from Pomax/gh-pages

better input handling, hopefully?