Added some logging stuff
merging master into snapSkeleton, no conflicts