Fixed some rendering bugs in the report generator
Updated docs
Merge branch 'release/0.2.5' into develop