Changes as discussed in PR #101