Merge pull request #111 from MasterTH-PyPy/patch-1