Merge pull request #34 from edsu/master

upped version for release to pypi