17-09-2014 final commit