updated file
Merge branch 'master' into gh-pages

incorp latest from master