Merge pull request #26 from sarality/master

Merging changes from Master
Merge pull request #28 from sarality/column_config

Merge pull request #26 from sarality/master