#33 - Improved the formatting of tables

Pull request for #33