allow separate column and row initialization
Merge branch 'separate_column_and_row_initialization'