Update github URLs
Merge branch 'master' into review