commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Dodo.php
Merge pull request #11 from Pengzw/master

commit