Resolving Issue #70 and #72