Merge pull request #3 from caseysoftware/comments

Comments, method tweaks