GH114 - Link Handlers

Issue #114, #115