starting to work on feature 2
Merge pull request #3 from tamarzil/Feature2

merge feature 2