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

Update to new cfg syntax