Merge pull request #1 from billshihe/iss53

changed test1
removed line from branch iss53
changed a line in test1
added another line