Resync with latest API changes

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Merge pull request #22 from shefty/master

Resync with latest API changes