Resolve "temp03"

Zekun Fanrequested to merge
15-temp03 into master

Closes #15

Edited by Zekun Fan

Merge request reports