Merged PR #119