Fixing the height
Merge branch 'develop'