Update for 0.9.0
Merge pull request #26 from karai17/patch-1

Update for 0.9.0