Updates

Updated from http://code.google.com/p/vamcart/source/browse/