resolves #48 and #49