Fix for upstream changes
Merge pull request #1 from sfackler/master

Fix for upstream changes