commit 2014-07-01 21-24