Add support for sockets
More conditionals to clean up the code
Merge branch 'feature/sockets' into develop

* feature/sockets:
  More conditionals to clean up the code
  Add support for sockets