changes according to latest requirements
Merge branch 'master' of https://github.com/grnet/hch-roll