Proposed fix for #8 - link problems