Merge branch 'master' into gh-pages
some correntios
testing commiting using linux