Working on isue #15