Removed empty lines.
Added map-columns (with tests).