Issue 18

Resolves Issue #18