Make sure to display columns for values below 4
Merge branch 'dev'
Bump for release 1.5.5