Tried to fix emperor problem
Merge pull request #244 from squix78/DevBranch

Tried to fix emperor problem