Merge pull request #14 from greatwolf/master

Porting changes for Python 3.3 + fix for issue #13