Pushing changes based on product changes, upstream
Merge pull request #40 from vhalbert/pushupstream

Pushing changes based on product changes, upstream