Merged and updated everything in master branch