Merge remote-tracking branch 'origin/gh-pages'
added a new feature
fixed display issue