Issue #45 Related Changes