some chages done
Merge pull request #131 from raviosc/developer107

some chages done