Added changes to master branch