changed to pointer
Merge branch 'master' into gh-pages