changes by dev119
Merge pull request #115 from raviosc/developer119

changes by dev119