Update for upstream changes; fixes Jenkins build.
Merge pull request #9 from agouge/fix/upstream-changes

Update for upstream changes; fixes Jenkins build.