Merge pull request #23 from stulees/master

Ensuring to properly restore and instantiate Column Selector