Resolve Issue #39

Resolve Issue #39