Merge pull request #715 from simonkwesi/patch-1