Feature/fix issue 8