Merge branch 'master' of github.com:datashaman/object-filter

Conflicts:
	README.md
Merge branch 'master' of github.com:datashaman/object-filter