implements issue 110
because regex are always wrong
Merge pull request #113 from thomas-mangin/master

sync