This already contains the changes of !304 (merged) Closes #253 (closed)
This will create a new commit in order to revert the existing changes.
