Merge pull request #7 from xrotwang/master

getting ready for a release on pypi