make it recover from crashes
stop relying on http referrer
Merge remote-tracking branch 'origin/master'