common edit
iMerge branch 'master' of https://github.com/chrisbussell/craglogger