ENH: GH #2 fixed 2.10 compatibility issues