Fixes #67 (closed), #80 (closed).
This will create a new commit in order to revert the existing changes.
