Eluna fix compile
Eluna fix build
Merge branches 'master' and 'wip'