Fixed configuration management bugs
Merge pull request #2 from teddyphreak/master

Fixed configuration management bugs