made a change
made other changes
add a new things Fixed #3
Merge branch 'testing'
Merge branch 'iss3'