Fixed an issue with getting user input
Merging to get rid of mindblow in the repo