Feature/fix issue 30