Cleaning up, adding link
Merge branch 'develop'