Fix the NPE
Fix Pull request error
Fix pull request error1
Merge pull request #8 from scsbatu/master

Looks good (apart from whitespace changes creating extra diffs;) - thanks Suraj! :)