Merged code from the master branch