Cleanup

- Removed dependecy to System.Console.Readline
* fixed parsing of terms in console