Branch: Development

Please verify changes
Merge pull request #1 from nitin777/development

Branch: Development changes
verify changes work ok.