Merge pull request #1 from andburch/master

pulll
Merge pull request #2 from andburch/Keeping-the-comments

Merge pull request #1 from andburch/masterm