incorp review comments
review comments incorporated
Merge remote-tracking branch 'nayan/workspace'