merged with master
edited exchanger.properties
minor fix