Changed to std::unique_ptr.
Added missing source file header.
Minor Init() cleanup.
Merge pull request #10 from murrekatt/develop

Some more cleanup.