Merge laptop with master branch