Fixed couple of critical typos
Merge branch 'dev-ma'