Tickets #117, #126, #151

Jan Delemberrequested to merge
ticket_#117 into master

closes #117 (closed), closes #126 (closed), closes #151 (closed)

Edited by Jan Delember

Merge request reports