Expose port 8080 not 80
Merge remote-tracking branch 'upstream/master'