Merge branch 'Kevin'
clean up error message
Merge branch 'Saumya'
Merge branch 'master' into Kevin