Merge "Fixing spell correcton" into ub-now-master