Merge pull request #517 from negativeExponent/input