Re-re-factorfactor
Merge branch 'master' of https://github.com/fish2000/Praxa