commit weekend 19-09-2014 working point 8-9