typos fixed
Merge branch 'licensing' into develop