Revert changes concerning the smart pointer
Merge pull request #148 from TsudaKageyu/reset-smart-pointer

Revert changes concerning the smart pointer