Merge pull request #125 from yarons/patch-2