Added ability to turn on logging of output
Renamed file