Added Issue #166 to track