Merge pull request #96 from duzun/patch-1