Fix #184
Merge branch 'unstable' of github.com:telefonicaid/Rush into unstable