japaric Merge pull request #91 from musoke/patch-1 …