commit 2014-06-25 16-57