Merge pull request #451 from JoshMackin/master

fixes #414
#424, Cleaned up the table