added height and width
Merge remote-tracking branch 'origin/master'
added height and width