made changes
Merge branch 'iss1'