fixing issue #2 and initial configuration support