Finished my_feature1
Merge pull request #1 from folex/my_feature1

Finished my_feature1