more updates
Merge pull request #204 from loadedcommerce/B1372

more updates