Merge pull request #65 from sct/dev

Fixes new Forge launching issues