changes done by dev20
Merge pull request #495 from raviosc/developer20

changes done by dev20