Merge pull request #10 from codelandcz/master