de2our remove/add
Merge branch 'gh-pages'