Fixing 1
Fixing 2
Merge branch 'Fixing2'