fix issue #70
Merge branch '1.1' of https://github.com/oria/gridx into 1.1