changed in feature1
Merge pull request #1 from fwu8nastygal/feature1

Merge from feature 1 into develop branch
Merge pull request #2 from fwu8nastygal/develop

Then merge from develop into master