Altered filter options to match other implementations
:lipstick: Housekeeping
:weary: The last of the Doubles.
Merge pull request #216 from maksimov/2014.05

2014.05