refactored due to split off server component
Merge pull request #4 from zelgerj/master

refactored due to split off server component