Merge pull request #4 from grdscrc/dev

Dev
Merge branch 'dev' - fixing issues
Merge branch 'dev' - still fixing issues
Merge branch 'master' of https://github.com/grdscrc/arthurius into dev-duf