Normalisation
Merge branch 'master' of https://github.com/ayzz/zappy
test: