removed '>' on console input
Merge branch 'develop'