added input
Merge pull request #4 from kcampen/input

added input
merge conflict resolved