Manually merging #105.