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