Working on isue #37