Added Feature1
Added feature2
Added addtional features to feature2
Added feature_additional
Added feature3
Fixed bug#1234
Really fixing bug1234