Fix #19: Gridview enhancements v1.3.0