Issue #25 links

Issue #25 - bring links into compliance with HAL spec