Merge pull request #361 from anilgooru/dev-branch

Bug fixes.
Fixed: null pointer issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: