Patched up regex matching bug. Included tests for it. Fixes issue #26.
Merge branch 'rubenvereecken-master'