changed 3 to a 4
Merge branch 'master' into gh-pages