Improvements in the converter
Merge pull request #38 from jDramaix/jd_improve_converter

Improvements in the converter