fixes for Murali
Merge pull request #29 from yushan87/update-murali

fixes for Murali