first draft
Merge branch 'master' of https://github.com/amemn/Poor-Man-s-Table