Some Refactoring
Merge origin/gh-pages into gh-pages
refactoring