Fixes #139 #159 - using Mark's regex, simple enough