changes
Merge http://github.com/prokhatskiy/ecom