This merge request fixes the problem described in #25. See the issue for more details.
This will create a new commit in order to revert the existing changes.
