Issue 10 improved with regular expression
Merge branch 'master' of https://github.com/tanpd/EPS