Updating regex to fix conditional mangling

fixes #263 ??

Slight edit to regex so that comments can still be on same line
Merge pull request #384 from zeppocreative/master

Updating regex to fix conditional mangling