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

refactored due to split off server component