Merge pull request #1 from Gargol/feature1

feature1 finished
feature 2
Merge pull request #2 from Gargol/feature2

feature 2
resolved merge conflict