resolves #136; resolves #137