Add Converter class
Merge branch 'develop'