improved doc
Merge branch '0.3'