Improved logging
Merge branch 'master' into ApocGraffiti