Closes #76
Closes #50 (closed)
Closes #71 (closed)
This will create a new commit in order to revert the existing changes.
