Fixes #1108, not sure how this ended up there
Fix NPE
Update README.md