changed in feature2
Merge pull request #3 from fwu8nastygal/feature2

Merge from feature2 into develop