Merging pull requests and bumping to 2.4