Merge pull request #66 from haard/master

Patched for Python 3 - tentative
Add Python 3.3 tests
Merge remote-tracking branch 'fork/master'