Merge pull request #25 from aothms/master

Refactoring shared_ptr and array usage