First contribution

This very commit should be in the original repo.