Issues 24 and 27

Created a new PR to include resolutions for issues 24 and 27 based on PO feedback