Feature/fix issue 105