Adopted API changes of 0.1.94
Merge pull request #6 from joa/master

Adopted API changes of 0.1.94