Implementing Issue #45