Added feature1
Added feature2
Added additional features to feauter2
added additional feature
Fixed bug 12234
Fixed the bug12234
Added fix1
Added fix2
Added fix1
Merge branch '1.0_fixes'