Commit for daily work 2013-05-31