Added changes from PR#65 discussion