Squashed commits into a single commit for easier commenting on Github