commit feature 1234
Merge pull request #5 from damianpop/feature_1234

commit feature 1234 - This was edited at the moment of merging!