#8 fixed! modified regexp
#8 fixed
Merge pull request #10 from swytman/8-bug-fixing

Done