Commit FRI 7-04-14 15:45