modified opts output, added checking for null sourceserver variable
added comment, commit for issue #4 logging
Merge branch 'master' into issue_4