194821
MacRae was City Architect for twenty years and his infill developments and reinterpretation of Scots vernacular architecture are an important part of Edinburgh 's inter-war heritage .
 MacRae, Edinburgh
Please list all entity words in the text that fit the category. Output format is "word1, word2". 
Option: location, person, organization 
Text: {0} 
Answer:
 MacRae, Edinburgh