Added timeout for services discovery
Fixed bad service saving
Merge pull request #30 from glatorre/master

Added timeout for services discovery