Nomenclature Module and Refactoring
Merge remote-tracking branch 'origin/Office'