Fix #207. Fix #208
Merge branch 'removeWinston' of github.com:telefonicaid/Rush into removeWinston