Updated comments
Merge branch 'reinier'
Merge branch 'master'
Merge branch 'mark'