Merge "Text cleaning." into devel/master