Merge pull request #9 from fcvarela/develop

Python 3 support