FIX #47
Merge pull request #49 from pointhi/master

FIX NullPointerException #47