Aug 5 2014 Update

Update branch