Fixing and changing links
Merge branch 'hotfix/0.9.1'