Iss55

Issue #55 completed. Requesting merge back to main branch