Second colspan fix for Issue #21

Added in support for colspans and did a bit of refactoring.