Issue #51 updated. Issue #52 fix.