Add port option to be able to run on alternative port
Merge branch 'enhancements/specify-port-20'