Upgrade to work with Manifest version 2.
Merge pull request #19 from pwhelan/master

Update to work with Manifest Version 2.