Fixes Issue #15