Simplify and update regexp to accept periods
Merge pull request #13 from VividCortex/12-regexp

Simplify and update regexp to accept periods