Small documentation update
Merge branch '0.2' into dev