Resolve "Issues to fix before milestone-2"

Merged Wang Yuyang requested to merge 3-issues-to-fix-before-milestone-2 into master

Closes #3 (closed)

Edited by Wang Yuyang

Merge request reports