Made adaptions regarding to discussion on github