made some edits
Merge branch 'mybranch'