feature3 - take 1
f3 - take 2
Merge pull request #2 from iceshard/feature3

feature3 - take 1 (all ok)