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