spelling mistake corrected
height issue fixed
fixes
merge conflicts
email from changes