I've got 99 regex problems

Fix for #65