Fixed Issue #14