Don't lose trailing empty columns when there are more than one of them.
Merge branch 'master' of https://github.com/chipster/chipster.git