Merge pull request #127 from yarons/patch-4