added feature1
Added feature 2
added to feature1
Added additional features to feature2
Merged feature2_additional into master
commit of fix 1 of fixes c of v1.0