cleanup after merge of pull request #18.