resolves #47, #49