changes done by dev119
Merge pull request #197 from raviosc/developer119

changes done by dev119