Merge pull request #2 from underrun/master

Improvements to Python 3 support (Thanks!)
Issue v0.6