11/10/2013 - final commit