changes by 119
Merge pull request #102 from raviosc/developer119

changes by 119