FIX: Table support

Fix Issue #5