Switched back to using curses. Added more command line arguments
Merge branch 'master' into python2