temporarily uncommenting code so urls will work
Merge remote-tracking branch 'upstream/master'