dd
Merge branch 'master' of https://github.com/charles-li/magnet

Conflicts:
	lib/src/filter.py
ask liu cheng for help