modal changes
comments - indents
Merge branch 'master' into gh-pages