hehehehehe
Merge remote-tracking branch 'poooong/master' into contrib

Conflicts:
	README.md