commit 2014-08-05 12-39