commit  23-07-2014 ###