Merge with repo andrewnester/KLogger