Fix for Python 2 and 3, close #317