Revert "Merge branch 'master' into 'master'"

Merged username-removed-832286 requested to merge revert-39e171ff into master

This reverts merge request !8 (merged)