#205, small configuration changes