Merge pull request #18 from DustInMonteriggioni/Branch-chyb

Branch chyb
正在设计过滤器
Update README.md
Try to solve conflicts
Merge pull request #19 from DustInMonteriggioni/Victor

Victor
Merge pull request #20 from DustInMonteriggioni/master

Master into Branch-chyb