Implement new configuration options. fixes #8