Manually merge @arlolra's pull request (#274)