Updated sources 2013-04-04_03-43-48
Merge remote-tracking branch 'origin/master'