changes done by dev 119
Merge pull request #88 from raviosc/developer119

changes done by dev 119