Add support for 1.9 fixes #181