merged PR #119