remove comment; fix model updating
Merge branch 'master' into gh-pages