Fixed npe
Merge pull request #60 from kskkbys/develop

1.4.1