Fixed #4, 5, 8, 10 and 13

Open Thomas Bullock requested to merge tom into master

Merge request reports