Replaced some underscore filters with native filters
Refactoring and cleaning
Ready for release 2.0.1
Merge pull request #167 from tomvantilburg/master

merge from Tom