fix bug....
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages