update 20-08-2013 from shode