Feature/fix issue 139