Feature/issue 1

Solution for #1