Merge pull request #31 from thierryba/master

Fixed deprecation warnings in python 3.6