fixed step 2
Merge branch 'Step2-Bugfixing'