Develop 2.0

This pull requests contains support for custom modelconverters.