Added tests for parsing of filters and options
Merge remote-tracking branch 'upstream/master'
Merged changes
Merge pull request #11 from riverrun/master

Small changes