updates from Krishnan
Merge pull request #1427 from mollybostic/master_0430

updates from Krishnan