Fix #137 (closed) and #136 (closed). Yup.
This will create a new commit in order to revert the existing changes.
