fix crash
Merge pull request #25 from element6/master

fix crash