20-09-2014 final commmit