Update 21/1/2013
Merge remote-tracking branch 'origin/master'
update Jan 23