Feature/issue 69

Remake pull request