Changed related to community feedbacks (PR #27)