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