Changes done by dev 103
Merge pull request #264 from raviosc/developer103

Changes done by dev 103