Basic Outputs html and urls for #127
Merge remote-tracking branch 'origin/master'