Issue #17

Resolved Issue #17