Finish webreader
Merged 'dev'.