work on Issue #106