Fix #23

Merged Matthieu Boileau requested to merge develop into master

Merge request reports