Updated to 0.9.0
Fixed to work with new API
Merge branch 'Update-to-0.9.0'