Fixed 1.9 support and updated to support 1.10 as well