Modifications made to accompany PR #21 in adam.