Slight refactor, getting rid of unused code.
Merge. Refactoring and ip address reporting fix.
Merge pull request #5 from zapletal-martin/master

Slight refactor, getting rid of unused code.