Please always create separated pull requests to get your code into master faster.