Fixed Issue #109.