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

refactored due to split off server component