Table fixes
Merge pull request #18 from ScriptRock/cheyne

Table fixes