Merge "fixing spelling errors"