commit 05-01-2013 #2