wangronin Merge pull request #1 from nojhan/master