Iss34 Resolved

Resolved Issue #34. Merge into main branch.