Merge pull request #21 from magicCzc/dev