[Ch3-*] git merge

refs: #38