Merge pull request #499 from negativeExponent/fix_input