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

changes done by dev119