MR: Issue_61 to develop

Kostis Trantzasrequested to merge
issue_61 into develop

Closes #61 (closed)

Merge request reports