Do what I wanted to do in last release
Release 0.8