updated for 0.9.0
Merge commit 'cedace658f27c8e46ed1786c1e06f91a949773de' into feature/settings

* commit 'cedace658f27c8e46ed1786c1e06f91a949773de':
  updated for 0.9.0