Merge pull request #42 from yuvallanger/patch-1