Closes #110 by adding support for 2.10 back