Merging master branch with my changes.