Added fix1
Added fix2
some changes
test
Added fix1
Merge branch 'v1.0_fixes'