added 2 new entries
Merge branch 'master' into gh-pages