revert to previous regexp; added regression test
Merge pull request #41 from Arkham/fix_adapter

revert to previous regexp; added regression test