Maybe fixed Issue #3

and Support Sprint 35(Issue #7)