Issue #5, Issue #8 done