Fixed crash
Merge pull request #2 from XForce/master

Fixed crash