Merge pull request #28 from LinShunKang/master