Merge pull request #280 from daenney/fix-pin-comments