Back to my changes based on the master branch

Because I have a overlay problem with gh-pages branch