Merge pull request #2 from iBaa/master

Merge pull request #146 from liuxuan30/master