Merge pull request #59 from kskkbys/develop

1.4.0
Fixed npe