Merge branch 'master' into dev
tidy up

tidy up commenting, add links to readme
link fix
Merge branch 'dev'