Cleaned up log output in console window, fixed minor bug.
Merged origin master.