Added changes as outlined in issue #104.