changes by dev20
Merge pull request #137 from raviosc/developer20

changes by dev20