Merge branch 'patch-4' of dustdfg/dragora into master