Merge pull request #99 from sortega/task/135_integration

Complete integration of DefaultExchangeActor
Fixes to master so it works on Windows again
Merge pull request #100 from edrevo/fix-master

Fixes to master so it works on Windows again