Modifying regex to allow for new connection types
Merge pull request #19 from tkadlec/master

Modifying regex to allow for new connection types
Thanks @tkadlec