Fixed crash
Merge pull request #2 from mvarnagiris/original

Fixed crash