Made corrections due to merging 'master' branch