Merge pull request #161 from gvol/master

Improve regular expressions to handle cases with :#:# in the code
Prevent crashes (for me)