Merge pull request #321 from kevmoo/master

Fixes for libv2 changes