Columns are fixed
Fixing external api code
Merge branch 'master' into gh-pages