fix #3 fix some bugs
Merge branch 'master' of https://github.com/193s/marg

Conflicts:
	README.md