Bug fix for NPE
Merge pull request #14 from bhariharan/master

Bug fix for NPE
Merge branch 'master' into unstable
Merge pull request #16 from bhariharan/unstable

Merge branch 'master' into unstable