Initial commit
Implements the 'columns' Attribute
Merge remote-tracking branch 'origin/master'