search/replace gone wrong
comment formatting
Merge pull request #55 from sbillard/master

fix search/replace gone wrong & comment formatting