fixes issue #699
fixes issue #699
Fixed #710
Merge pull request #709 from informatom/master

Fix for issue #699
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/w2grid.js