Add notes from class.
Merge branch 'master' into rail