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