update and accepting PR#9