Resolve Issue #22

Resolves Issue #22