Added feature1
added feature3
Fixed bug#1234
Really fiixing Bug#1234
Changes again!
Added fix1
Added fix1
Merge branch 'v1.0_fixes'