Table view

To fix issue #26