Fixed bugin HW5
Merge branch 'develop' into staging