changed line 2
Merge pull request #1 from daeq/feature1

changed line 2