Fixed bug#1234
Add feature #1
add f3
added fix1
added fix3
added fix1
Merge branch 'v1.0_fixes'