Uploaded to PyPy

fixes GH-21
fixes GH-18