Added TCP support
Merge branch 'master' of github.com:SmartCocktailFactory/factorymaster