Work towards 0.9.1 support
Merge pull request #10 from avital/master

Work towards 0.9.1 support