Merge pull request #1 from BurningPython/master

update
Merge pull request #5 from julycw/master

Merge pull request #1 from BurningPython/master