Reimplement a few methods
Merge branch 'master' of https://github.com/elunaluaengine/eluna