This change resolves both #7 and #15.