adding support for variable height rows
added support for variable height rows
Merge branch 'dev'