Add short description
Supports filling only width or height
Merge branch 'develop'