Commit from window os 2014-4-9 18:01