02-10-2013 Update and Merge