More tweaking regexen. Fixes Issue #2