com1
conf resolve
refactoring
refactoring
Merge pull request #15 from Eorling/dev

Dev