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

Update to new cfg syntax