fix height and width
Merge origin/master