[NF] Work in progress (#8).
Merge branch 'master' of https://github.com/avicentic/tap