fifth commit. up to 7:04 andevcli3 17/10/14 17:16