Merge pull request #4 from jespino/some-python3-compatibility-fixes

Some fixes for compatibility with python3