Thx Todd Fredrich, Pearson eCollege, now Kaize team
Merge branch 'master' into gh-pages

* master:
  Thx Todd Fredrich, Pearson eCollege, now Kaize team