Refactor converters

Thanks to @wzpan's work
Merge branch 'master' of github.com:celadevra/idenizen.net