Merge remote-tracking branch 'devnoname120/xlink.me' into develop

Closes #293, #412.