#36 added 1.7.10 support