change by dev20
Merge pull request #497 from raviosc/developer20

change by dev20