Manual merge of branch to resolve #193.