updates
Merge pull request #270 from loadedcommerce/D1578

updates