Feature/fix issue 70