MR: issue_16 branch to develop

Kostis Trantzasrequested to merge
issue_16 into develop

Closes #16 (closed)

Merge request reports