Merge pull request #20 from flashii/master

world wide online
Merge pull request #21 from flashii/stable

Merge pull request #20 from flashii/master