Fixed to crash
Merge pull request #9 from masuidrive/fixed_to_crash

Fixed to crash