Umkus Merge pull request #90 from petecooper/patch-1 …