Updating to smart pointers
Merge branch 'master' of https://github.com/chainsapm/chainsapm.git