Merge pull request #7 from pjediny/contrail311-fixes

Contrail311 fixes