Transferred changes from dev branch of translator repo