General fixs arround the code base
Merge pull request #6 from Supernomad/QN-Logging-Beta

General fixs arround the code base
Commiting merge from master