Turn off logging + minor code improvements

Turn off logging + minor code improvements
Merge pull request #41 from CascadeFramework/master

Turn off logging + minor code improvements
Merge pull request #42 from jslegers/master

Turn off logging + minor code improvements