use localendpoint rather than 'localhost'
Merge remote-tracking branch 'origin/master'