Arranged the code again.
Merge branch 'master' into gh-pages