Improved logging
Merge branch 'master' of https://github.com/Todd-Davies/Squire