Feature/fix issue 80