added tables; see issue #24