Updated sources 2013-04-03_05-51-05
Merge remote-tracking branch 'origin/master'