Merge pull request #2 from IntelOrca/master

Update to master
Attempted fix of thunder crash
Fix #169
Merge pull request #189 from duncanspumpkin/fix_thunder

Fix thunder