Tickets #40, #145

Jan Delemberrequested to merge
tickets_#40_#145 into master

closes #40 (closed), closes #145 (closed)

Merge request reports