Merge pull request #64 from raviosc/developer125

Developer125
changes for conflict solve2
Merge remote-tracking branch 'origin/master'