Merge pull request #215 from bhariharan/unstable20

Merge 'unstable' into unstable20
Fix Typos
Merge pull request #216 from bhariharan/unstable

Fix Typos
Merge branch 'unstable' into unstable20