Updates
reomve from_Text ++ update tests.
Merge branch 'master' into develop