Changes made while integrating it with our internal system
Merge pull request #922 from abersnaze/debug-updates

Changes made while integrating it with our internal system