issue 16, 23, 24 merge request

ZHENG Ruyirequested to merge
Ruyi_ZHENG_COPY into dev

Implements #23 (closed), #16 (closed), #24 (closed)

Edited by ZHENG Ruyi

Merge request reports