Dhiraj edits
Merge branch 'Chris'