quick commit 2014-09-18 16:36:34