Merge pull request #205 from bhariharan/unstable20

Merge 'unstable' into unstable20.
Fix for NPE
Merge pull request #206 from bhariharan/npe

Fix for NPE
Manifest Changes
Merge pull request #207 from bhariharan/master

Manifest changes
Merge branch 'master' into unstable
Add JAR
Merge pull request #208 from bhariharan/master

Add JAR
Merge branch 'master' into unstable
Merge 'master' into unstable
Merge pull request #210 from bhariharan/unstable

Merge 'master' into unstable
Merge branch 'unstable' into unstable20