Added docs
Merge remote-tracking branch 'origin/v0.3-refactor' into v0.3-refactor