Resolve "temp6"

Zekun Fanrequested to merge
17-temp6 into master

Closes #17

Edited by Zekun Fan

Merge request reports