Merge pull request #1 from viavoo/test

display_name and log_type as parameters
Making sure that the server is registered before following files

Making sure that the server is registered before following files
add: check if file exists before following it
Merge pull request #2 from viavoo/master

PR test - master