Fixed Issue #108