Removed unused imports
Fixed a bug in parsing command-line input
Merge remote-tracking branch 'origin' into sources
remove debugging statements
Fixed a bug in parsing command-line input.
Merge branch 'sources'