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

Update to the new cfg syntax