add dburianov changes and nconf
add dburianov changes and nconf
Merge pull request #9 from dburianov/master

Add dburianov changes and nconf