Merge branch 'master' into gh-pages
rake Gem added
Merge branch 'gh-pages'