commit 11-10-2014_2