Removed instructions to bind to specific port as it disables broadcast..
Merge branch 'frodo' into gotham