#48 Fixes for Python 2