Fixed issue #91.
Merge branch 'report-viewer-fixes'