Beta version
Beta version
Merge origin/master
Improvements on console input