Use shared_ptr instead of new/delete to prevent memory leak (#418)

Use shared_ptr instead of new/delete to prevent memory leak (#418) #571