Added configuration options
Updated to 1.0 proper.