quick commit 2014-12-19 09:58:01