Merge pull request #1 from SlaffM/my_feature

my  feature
Merge pull request #3 from SlaffM/dev

Merge pull request #1 from SlaffM/my_feature