Update #139 (closed)
Closes #157 (closed)
This will create a new commit in order to revert the existing changes.
