Merge pull request #12 from tyom/develop

Grid fixes and started adding helpful mixins.
Version bump