date and location added
gem file added
Merge branch 'master' into gh-pages