commit 2014-06-03 12-42