Update lib
Fix filter
Merge pull request #185 from zoic21/master

Merge from master