Maybe fixed Issue #1

and Support Sprint 35(Issue #7)