Issue #202 - fix conflicts,remove hard coded link and minor fixes