fixed userinput
test
test
test2
test
Merge branch 'master' of https://github.com/Patrick94/maxwell