Merge pull request #26 from kwoodson/master

Fixes for compatibility with 2.4