Crashed by Smiley
Merge pull request #1 from dca/master

Crashed by Smiley