small changes
style applied
Merge branch 'master' into gh-pages