Not sure if this fix is supergreat, but resolves #30 (closed)
This will create a new commit in order to revert the existing changes.
