comment refactoring
Merge pull request #27 from zelgerj/master

refactoring due to server component split off