Resolve Issue #47

Resolve Issue #47