Merge pull request #10 from starverte/master

Merge from master
Merge pull request #11 from starverte/master

Merge from master
Merge from master
Update to v0.9.7