resolves #15 and #16