commit 2014-06-18 16-48