Merged my own changes with those from the main repository.