add file
Merge pull request #2 from dsbonev/milestone_b

milestone b into master
Merge branch 'master' into feature_a_a