updated documentation
Merge branch 'develop/0.3.4-alpha'