Merge pull request #139 from retro-wertz/patch-3