Updated/Added missing documentation
Merge branch 'release-0.2'