Fix #18. Add negative lookbehind to ensure that replacement for  does not impact
Fixes #19. Optional fields should be optional
Merge pull request #21 from ticketevolution/bugfix-18-underscore-fixes

Bugfix 18 underscore fixes