rework to make the merge rule independence
Merge branch 'master' into gh-pages