0.9.1 support
Merge pull request #1 from CollectionFS/master

0.9.1 support