Revised conversion method & some other refactoring
Merge branch 'master' of https://github.com/Globobeet/thistothat