Merge pull request #109 from dunxen/patch-1