Xaroth Merge pull request #12 from Xaroth/rework-wip