Feature/fix issue 113