Merge pull request #242 from retro-wertz/patch-1