Added Feature2
Added featuer2
Added additonal features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug#1234
Really fixing bug#1234
Merge feature2_additional
Added fix1
Added fix2
Merge branch 'v1.0_fixes'