Merge pull request #268 from raviosc/developer125

Developer125
Changes For Testing safari
Merge remote-tracking branch 'origin/master'