Hyperlink cleanup
Merge branch 'development'