renyuanz Merge pull request #98 from Inambe/patch-2