Issue #48 and #49