Merge branch 'release-0.1.1'
right order for the links
Merge branch 'hotfix-doc' into develop