Updating to revision 197
Merge branch 'master' of github.com:paranoidgabe/thunder
Updating to revision 198