Resolve Issue #25
Fixes Issue #26