Merge pull request #22 from flashii/master

f