removed double the
Merge branch 'master' into new_intro