Update to the new cfg syntax
Merge pull request #409 from ebfe/cfg

Update to the new cfg syntax