fourth commit. up to end of andevcli1 17/10/14 15:28