Minor changes PR #4