Work on #5, tweak setup.py