* Improved performance by removing regular expression
* Fixed the feature, since it wasn't working
* Added unittest
Minor refactoring