Fixed Issue #13