Fixed Demo Crashes, Thanks @skrew.
Merge pull request #130 from PaitoAnderson/patch-1

Fixed Demo Crashes, Thanks @skrew.