some cleanup of initial config procedure
Merge pull request #35 from dalers/master

some cleanup of initial config procedure