twitter check 3
merging to master
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
clean up code and edit style