Revert "Revert "Merge branch 'master' of https://github.com/manuelep/ultimus""

This reverts commit 93156f5179922e80491b8356223c249eccc3b1ee.