Small changes in network and database
Merge pull request #17 from Agfct/Birgerto

Small changes in network and database