Only add columns that haven't already been added

This fixes issues #35, #77, and #126.