major v2 change
Merge pull request #1 from nburka/grid-layout

major v2 change