feature 2 added
feature2 changed
Merge pull request #1 from OndrejRitomsky/feature2

Feature2