Issue #813 - Internal conversions part done
Issue #812 fixed