Issue #70 + #71