Fix notes
Merge branch 'master' into atam-2014