Changes by Developer 125
Merge pull request #87 from raviosc/developer125

Changes by Developer 125