Merge pull request #22 from flashii/master

f
Merge pull request #23 from flashii/stable

Merge pull request #22 from flashii/master