Remove 2.0-only syntax and use the clunkier old-school syntax
Merge pull request #10 from kerinin/rm/1.9

Remove 2.0-only syntax and use the clunkier old-school syntax