Issue #17 better configuration handling.