Changed things in master branch