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

changes by 119