Improvements on Python 2/3 compatibility