Closes #4 (closed) and #10 (closed).
This will create a new commit in order to revert the existing changes.
