refactor converter
Merge pull request #18 from p1tz/master

merge