Added support for 1.9-1.10 (closes #53 #54)