minimal changes that support python2
Add argument now
Add integration tests
Update CHANGES