24/07/2014 commit

partial 2d, partial 6b, 8d, partial 9a