Merge "fix typo's"