update from tagore
Merge github.com:suryaphani/sample