link fixes and etc
Merge branch 'release/pianoman-d' into develop