Refactor
Merge branch 'master' of github.com:hahoyer/reni.cpp