Updated to master branch