Fixes Issue #13