Issues #24 and #25
Issues #24 and #25 testing