Wrapper classes to adapt to WP8
Added converter
Bug fix