Merge pull request #157 from wengxt/wengxt-patch-1