3 jan 2013 update
merge