Merge pull request #1 from Earlgoisman/master

testpullfromfork
Made some general changes
Some more changes
Removed unnecessary assignment
Merge pull request #2 from svj0hn/inputcleanup

Inputcleanup