Flamefire Merge pull request #2 from Flamefire/improvements