Merge pull request #286 from retro-wertz/patch-2