Convert 1.9 to 1.8 syntax. Fixes #23
Running tests, and fixing breaking changes, for 1.2.3