Issue #6 coplete