Added Fix1
Added Fix2
Added Fix1
Merge branch 'v1.0_fixes'