Resolves #11
Thanks, @af9063!
(This still requires some work)
This will create a new commit in order to revert the existing changes.