More modules
Clearing up PHP 5.4 requirement
Better regex
Merge pull request #1 from KamalN7/master

Update through PR because Laziness. :P