edited commit
Merge branch 'ChangeRequest2'
ChangeRequest3
Merge branch 'changeRequest3'