Fixes for #204 and #205
Merge branch 'master' of github.com:palasthotel/grid