few minor changes
Merge branch 'NewBranch'