Closes #31 (closed), #34 (closed), #35 (closed), #36 (closed), #39 (closed), #40 (closed)
This will create a new commit in order to revert the existing changes.
