Merge pull request #16 from zr40/patch-1