Fixes RAYO-107
Merge branch 'master' of github.com:rayo/rayo-server