Merge pull request #24 from FLHerne/master

Dragons and fire