Updated adding functionality
Merge branch 'adding'
Merge branch 'master' into gh-pages