New config

Fixes #27