Updates doc according to issue #2
Merge branch 'develop'