Added fixes discussed in PR #70