tweak setup.py
merge
bump version
Merge pull request #9 from dougwig/master

0.5