feature #109: merge fix #121

Closed mk1808 closed 5 months ago