Added missing Python 3 support
Merge pull request #186 from danieljl/develop

Added missing Python 3 support