Made two column output
Merge branch 'master' into two_columns
Daili
changes
haha