SVN sync

Moved to shared pointers
Add plotting
Added feature extraction