Merge pull request #16 from flashii/master