an upgrade from obfuscurity master
Merge pull request #1 from harvesthq/upgrade_1017

an upgrade from obfuscurity master