modified some url handling
Merge remote-tracking branch 'origin/master'
presentation ready
Merge remote-tracking branch 'origin/master'