Made consistent with final version of vendor.py code.
Merge pull request #13 from webmaven/master

Made consistent with final version of vendor.py code.