Fix NPE
Fix NPE
Fix NPE
Fix grammar
Merge pull request #18 from nonexpectation/master

Fix for issue 10