Finished pull request 1 by squashing