jd fixed #340
Merge branch 'master' of github.com:palasthotel/grid