Merge pull request #7 from 1000ch/master

 add null check
Update v0.5.4