fiexed a couple of typos
Merge branch 'develop'