Merge pull request #204 from bhariharan/unstable

Merge 'master' into unstable
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