Associated with Issue #32

Associated with Issue #32