Resolve "temp5"

Zekun Fanrequested to merge
16-temp5 into master

Closes #16

Edited by Zekun Fan

Merge request reports