fixed issues with previous merge
Merge branch 'master' of https://github.com/justasitsounds/SnarkyCommentPig