history integrated... couple of fixes needed
Merge branch 'master' into josh-work
removed redundancy
comment
fixed url