Closes #195 (closed) Closes #203 (closed)
This will create a new commit in order to revert the existing changes.