author modify #4
merging with contribution #2