831 - Width and height account for gutter

Close #831.