Merge pull request #227 from raviosc/developer125

Developer125
Merge pull request #228 from raviosc/developer125

Changes for testing
Testing Changes
Merge remote-tracking branch 'origin/master'