See #128, #130, #137: Merged pull requests.