PR #210 ready for merge.