Revert "Revert "Merge branch 'pr/50' into wip""

This reverts commit e86a03cd532a87a80ccbb6f40a72835741fece54.