Merge pull request #9 from murrekatt/develop

Restructuring and cleanup
Changed to std::unique_ptr.
Added missing source file header.
Minor Init() cleanup.