Merge pull request #81 from sonata-nfv/revert-80-master